Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 07:31:26 +0000 (23:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 07:31:26 +0000 (23:31 -0800)
commitfec321da6a8e57ebd7f107ff6cb6a4b2e459561b
tree4c249a6980dc1543cf385895f6920fd0677e7b00
parentbb83a9e5859490f81243309e4a2475b0b19d03c9
parente1b464bd6c2cf4445388176a6ff3b978b4cdbc5b
Merge from trunk.